Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implemented speaker detail page and enchanced model #108

Merged
merged 2 commits into from
Jun 21, 2017
Merged

Conversation

PirosB3
Copy link

@PirosB3 PirosB3 commented Jun 18, 2017

Adds a few fixes on model, queries and enables speaker detail page

Ticket: pybay/symposion#1

@epsy epsy mentioned this pull request Jun 19, 2017
@@ -51,6 +51,7 @@ class Proposal(ProposalBase):
what_will_attendees_learn = models.TextField()
meetup_talk = models.CharField(choices=MEETUP_CHOICES, max_length=100, default="No")
speaker_and_talk_history = models.TextField()
speaker_website = models.TextField(null=True)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<div class="container" style="padding-top: 150px;">
<div class="row">
<div class="col-sm-6 col-md-4">
<a href="{{ speaker.photo.url }}" data-title="Meetup 2013">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Meetup 2013"

???

<h3>Abstract</h3>
{{ talk.abstract }}
</p>
<a href="#" class="btn">&nbsp; &nbsp; Conference Schedule &nbsp; &nbsp;</a>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

&nbsp shouldn't be necessary now that .btn has padding-left/right 15px

pybay/urls.py Outdated
@@ -56,6 +57,7 @@
# url(r"^markitup/", include("markitup.urls")),
url(r"^our-sponsors/$", pybay_sponsors_list, name="pybay_sponsors_list"),
url(r"^our-speakers/$", pybay_speakers_list, name="pybay_speakers_list"),
url(r"^speaker/(?P<speaker_slug>[-\w]+)/$$", pybay_speakers_detail, name="pybay_speakers_detail"),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

extra $

pybay/utils.py Outdated

def get_accepted_speaker_by_slug(speaker_slug):
"""
This function is purpously done do avoid touching Symposion
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

purposely

pybay/views.py Outdated
from django.views.generic import TemplateView

from .forms import CallForProposalForm
from pybay.faqs.models import Faq, Category
from symposion.sponsorship.models import Sponsor
from pybay.proposals.models import Proposal, TalkProposal, TutorialProposal
from pybay.proposals.models import TalkProposal, TutorialProposal
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TutorialProposal isn't used

pybay/views.py Outdated
log.error("Speaker %s does not have any approved talks or does not exist", speaker_slug)
return HttpResponseNotFound()

speaker_approved_talks = TalkProposal.objects.filter(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use speaker.talk_proposal_set

@PirosB3 PirosB3 merged commit 25ac296 into master Jun 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants